In which case the JS handling won't be necessary anymore