Manually patching #81