Fixing a bit of assumptions
Ooops, forgot to back-number to final conflict