Fixing clones

Change-Id: I1ceaa63f6477c8b56fad2d11b7f4306d84c1e2aa