Fix for wrong message type