JS Bugfixing