Rollback and small fix

I fcked up :dancer: