Fix to support overriding