Fixed issue 63

Fixed issue 63