Fixed #99

Fixed #99