Mirroring feature fixed