Remove entity and set a new one to avoid pickup delay Bug