[#636] Check we set state to active