Fixed device hider swap bug, resolving issue #47.