CFY-1185 fix setup