Fixes a RuntimeException thrown when we try and take control of a switch we're already contending
2 files changed