proposed fix committed to branch ticket-c8c0b78c84