more fixing for blaze