CFY-1431 fixed refactor bug