for each fix for JS driver