This seems like an obvious way to fix the 1017 issues. I would like to request this to be added to the game.