Fix Operation bug