Buffer UE properly