Fixed align issues on rotate