Fixing "noop is not defined"