Duplicate fix #770 to correct branch