Fixing the chosen JS calls