Fixing issue 3