Fixed bugs when too much items