Kimitmond+js fix (maybe)