FIX broken logic for defaultJS