Fix mirroring

Change-Id: Id2c71c7fd61752d20ce95c10612bec96d3ed49e6