(move-changed-further-along-the-pike) trying to avoid race conditions

@interactivellama maybe try this?