Fixed #65