Fixed #119: NOOP returns the new object instead of the old one