Fixing PR13409