js fix
Merged