Fixed #85

Fixed #85