Fixed future state issue.