Fixed issue related to #81

Fixed issue related to #81