Fix get-cell