Candidate fix for #2400