Fixed commit and rollback to return self