Fix for Blaze