On PC you can move them right before starting combat. When enemies show up but before confirming start of the fight try moving them, maybe that'll work?
