Issue #601

https://github.com/moai/moai-dev/issues/601