Fix a bug where the switch do not close
Merge branch 'develop' of https://github.com/Hamdor/SE2-2.3 into develop