Fix a bug on the operator-pending mode.
Refactoring.