original push for fix #781