Fixing issue 70