Fixed #138
Fixed #137