Fixing cell generation (crossed borders)