One more fix for #645