#345: Fixed JS