Fix bug with same cell used for old and new bird