Fixed #98