OnEndOperation fix
Merge branch 'OnEndOperation-fix'