Use dylan-fix branch from Scott Ellis