Fix for #2039