Fix issue 34

Fixed issue 34