Fixed #130