#401

fix #401 + bump the version to 0.7.1

If this is ok:
 * will cherry pick this into master

We may wait a bit to release 0.7.1, or release it right away (what do you think?).