Fix for #2120