Fixed #144
Fixed #144