#4215: more general fix