Fixed #85
Fixed #86