Plugwise - Fix Issue 456 (partly)