Fixing issue 71