Fixed #64
Fixed #65