Fixed #20
Fixed #20