Fix for javascript