Tilstand bug fixed-ish