Fix items overwriting each other