Fixed bug with NOOP