Issue86

fix #86, based on #88