CFY-1222 fix init logic