One more fix for #1014