Update to use my fork with fix