same thing here, I moved this into the commit rescue block