Issue #8 - Fix for iDummy devices