Fix rotate and tranlate conflict