Fixed #109