Fix

supersedes #136 

depends on https://github.com/jackalope/jackalope/pull/188