Fixing message return bug