SHOULD HAVE DONE THIS A LONG TIME AGO
Merge pull request #388 from ZeusWPI/fix/fixed-that-fucking-javascript-error

SHOULD HAVE DONE THIS A LONG TIME AGO