Fix some stuffs? maybe? (please update JS)