fixes junbled themestates when chaning first responder