Keep row counts straight