Fixed #115