Fix for js