Fix #82

Fixed #82