Fixed #22