Fixed must commit before waiting for async to finish