proposed solution for #962