Fixed #110