Could introduce a couple bugs... Maybe we should do another PR about this ?