Fixed switches not responding to off correctly