Fixed #21
Fixed #21.