Fixed #197
Fixed #198