Fixed issue 68