Fixed #164
Fixed #165