Fixed #89
Fixed #88