Fix for #4902