Fix states and conditions