Fix for #2029