One more fix for #915