Hotfix for issue with javascript