Fixed #171
Fixed #169