Fixed #222