Fixed #116