Fixing the wrong final message