One more quick fix for #1922