Fix for #2189