Fixed issue 71