Fixed JS issue