Fixed #79
Fixed #80