fixed now so that a switch activates the moment you get in the cell that should make it impossible to be out-locked again
