Fix operation id problem