Fixed #102