Mirror fix on #352