don't double-count step 0
fix makeNext