Fixed helper to work with blaze