Fixing issue 2