Fix for MC-29475