apply Peter's patch to mirror utilities