Fixed #4
Fixed #3