diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille
index ce42753a..ae0da199 100755
--- a/usr/local/bin/bastille
+++ b/usr/local/bin/bastille
@@ -31,7 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-. /usr/local/share/bastille/common.sh
 
 ## check for config existence
 bastille_conf_check() {
@@ -131,6 +130,9 @@ if [ -z "${BASTILLE_CONFIG}" ]; then
     export BASTILLE_CONFIG
 fi
 
+# Load common.sh after setting BASTILLE_CONFIG
+. /usr/local/share/bastille/common.sh
+
 # Handle options
 while [ "$#" -gt 0 ]; do
     case "${1}" in