Fix for #5579