Fixed issue 56

Fixed issue 56