Fixed #86