Hot fix for js