fixing issue 2