Fixed bug
Need to fix JS