make the commit collection more robust