Js Bug Fix