Possible solution for Issue #15. I'm not sure if MqttService is the best place for this but it's working.