Fixes  issue 167

This fixes #167 and has been tested on a few of the offending devices already.