Title: Operation fix-up