One more fix for #910