Issue #325 - Fixing JS on server