Fixed #2
Fixed #2