Fixed #160