Fixed #104