CFY-1232 mock bug fix