simon fixed wrapper. Note: Lua-wrapping sucks!