Fixed #152
Fixed #147