Fix for #5648