fixing state not attached to waiver