Fixing issue 6