Patch #113 for internal use