Kill two problems with one stone

• The same second rotation still works