Issue #86, Fixed #90