Issues with copy paste

Change-Id: Iff9e877d52ffb2eb2134a0e699777f715a216e9e