Add a hack that fixes #171, and possibly #144 and #167 as well.