addressing FW-168. Tested on motes.