Patch from Chris Emerson: rather than dynamically calling