Chg batch refactor fix