Fix the one row case