Fixed #22.