Fix #152
Fixed #138