Fixed mapping LightwaveRF message to correct device