Maybe fix js issue