actually fixed issue #89 this time.