Fix for blaze