diff --git a/src/base/settings.py b/src/base/settings.py
index 4fafaa1a..9e1697d3 100644
--- a/src/base/settings.py
+++ b/src/base/settings.py
@@ -13,12 +13,22 @@ global settings
 settings = dict()
 
 
+# Return true if settings contains key
+def has(key):
+	global settings
+	return (key.upper() in settings.keys())
+
+
 # Set key to value
 # This must be defined before other imports so bt.message can use it
-def set(key,value):
+def set(key,value,end=False):
 	stack = [value]
-	if settings.has_key(key.upper()) == True:
-		stack += settings[key.upper()]
+	key = key.upper()
+	if has(key) == True:
+		if end == False:
+			stack += settings[key]
+		else:
+			stack = settings[key] + stack
 	settings[key.upper()] = stack
 
 
@@ -29,13 +39,6 @@ from bt.file import join
 from bt import xm
 
 
-# Return true if settings contains key
-def has(key):
-	global settings
-	return (key.upper() in settings.keys())
-
-
-
 # Return the value at key
 def get(key, all=False):
 	key = key.upper()
@@ -101,7 +104,7 @@ def parseInput():
 		opts, args = getopt.getopt(input, optc,	long)
 		for opt in opts:
 			if opt[0] == "-p":
-				set("PLUGPATH", opt[1])
+				set("PLUGPATH", opt[1], True)
 		set("ARGS", args)
 	except getopt.GetoptError, e:
 		error(e.msg)
@@ -161,8 +164,8 @@ write("Setting default values...", True)
 user = os.path.expanduser("~")
 #user = os.path.join(user,".ocarina2")
 set("USER", user)
-set("PLUGPATH", "../core")
-set("PLUGPATH", "../extra")
+set("PLUGPATH", "../core",True)
+set("PLUGPATH", "../extra",True)
 
 # Find out what platform we are running on
 set("ARCH", sys.platform)