courier stash bug and retreat optimizing