Fixed #82

Fixed #82