adapt to state derived in core

Adapt to this issue