Minimal fix for #2092