Fixed #89