Fixed #208
Fixed #206