fixed noop handling