Fix item rendering
Better fix for item rendering