proposed solution to #893