Fixed root state resolve