Trying to fix errors (broken state)