States should now get properly generated.