Update with suggested fix from Roger Light (original dev of libmosquitto)