fixing issue 1