CFY-872 fixed messages
CFY-872 fixed bug from previous commit