Fixed issue 73