Fixed #8
Fixed #8