Fix noop behaviour