One more fix for #962