Fixed #106