but yeah, this would already fix the whole issue.