fixing issue 8