fix issues with the first item