Fixed issue 34