Fix messageReceived