Fix bug with operation.
OOP styled operations