JS disabled version working now