Fixed #81

Fixed #81