Better fix for #2021