This has been fixed and pushed up to me repo: https://github.com/jhung/infusion/tree/FLUID-5276