Fix a bug which locks a player in place when switching to another set-piece taker