Fixed issue 84

Fixed issue 84