Another attempted fix for #719