Fixed issue #268
Recompiled JS
Fixed second part of issue #268