Fixed issue 72