Hacky solution but probably the best approach for now. I end up cycling all my pals when I return to base.