Fix for message-port