Addresses #137, preserves column keys even when no remaining rows