Rollback and small fix