Minor: assert condition, rename field
1