Patch accept return-type error ref #5