Fixed js issue again