Fixed #98

Fixed #98