Fixed js issue