Fix logic to use required state

`Air` is optional and thus is not declared in some of the frames, this
change removes regression.