Rapair behaviour of Clear Correct Switch. Fix #13
rebuild