Fixing issue 69