Fixed issue 90

Fixed issue 90