Fixed cells reinitialisation bug
Merged with the upstream repository