DummyDevice fix