diff --git a/aws_ec2_assign_elastic_ip/command_line_options.py b/aws_ec2_assign_elastic_ip/command_line_options.py
index a5a16d5..be01d28 100644
--- a/aws_ec2_assign_elastic_ip/command_line_options.py
+++ b/aws_ec2_assign_elastic_ip/command_line_options.py
@@ -2,9 +2,9 @@
 import argparse
 import sys
 try:
-    from ConfigParser import SafeConfigParser
+    from ConfigParser import SafeConfigParser as ConfigParser
 except ImportError:
-    from configparser import SafeConfigParser
+    from configparser import ConfigParser
 from argparse import RawTextHelpFormatter
 
 if sys.platform in ['win32', 'cygwin']:
@@ -12,7 +12,7 @@
 else:
     import os.path as ospath
 
-SETTINGS = SafeConfigParser()
+SETTINGS = ConfigParser()
 SETTINGS.read('{0}/settings.conf'.format(
     ospath.dirname(ospath.realpath(__file__))))
 
diff --git a/setup.py b/setup.py
index 7797ce1..5811b46 100644
--- a/setup.py
+++ b/setup.py
@@ -2,11 +2,11 @@
 import os
 from setuptools import setup
 try:
-    from ConfigParser import SafeConfigParser
+    from ConfigParser import SafeConfigParser as ConfigParser
 except ImportError:
-    from configparser import SafeConfigParser
+    from configparser import ConfigParser
 
-settings = SafeConfigParser()
+settings = ConfigParser()
 settings.read(os.path.realpath('aws_ec2_assign_elastic_ip/settings.conf'))
 
 setup(