fixed #21
Fixed #22