Fix for #2228