Fix for previous JS (2)