Fix for previous JS