diff --git a/chaioop/CMakeLists.txt b/chaioop/CMakeLists.txt
index 1dc9c0a..df0e108 100644
--- a/chaioop/CMakeLists.txt
+++ b/chaioop/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.6)
 project(chaioop)
 
 SET (CMAKE_BUILD_TYPE gdb)
-SET (CMAKE_C_FLAGS_GDB " -Wall -ggdb")
-SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb")
+SET (CMAKE_C_FLAGS_GDB " -Wall -ggdb -O3")
+SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb -O3")
 
 include_directories(../langkit ../dispatchkit)
 
diff --git a/chaiscript/chaiscript_engine.hpp b/chaiscript/chaiscript_engine.hpp
index 35b2914..e76c6a1 100644
--- a/chaiscript/chaiscript_engine.hpp
+++ b/chaiscript/chaiscript_engine.hpp
@@ -180,7 +180,7 @@ namespace chaiscript
             arraycall = value >> +((Ign(Id(TokenType::Square_Open)) >> boolean >> Ign(Id(TokenType::Square_Close))));
 
             arrayinit = Ign(Id(TokenType::Square_Open)) >> ~(boolean >> *(Ign(Str(",")) >> boolean))  >> Ign(Id(TokenType::Square_Close));
-            mapinit = Ign(Id(TokenType::Square_Open)) >> ~(mappair >> *(Ign(Str(",")) >> mappair))  >> Ign(Id(TokenType::Square_Close));
+            mapinit = Ign(Id(TokenType::Square_Open)) >> mappair >> *(Ign(Str(",")) >> mappair)  >> Ign(Id(TokenType::Square_Close));
             mappair = Id(TokenType::Quoted_String) >> Ign(Str(":")) >> boolean;
 
             vardecl = Ign(Str("var")) >> Id(TokenType::Identifier);