Fixed issue 93

Fixed issue 93