Js fix in production try2