Change to 2-nd callback with commit

#1630

All call backs using commit are now covered.