Fixed Commit/Rollback