re-patching issue #87