New fix for #724