Fixed message processing so close message is actually passed through