Fix for #2021