Stash of map output tracker fix