Real fix for #2021