Fix to hivemq