Updated with js fix