Fixed #80