Fixed #111