Fixed #196
Fixed #193