Fix for msg.data