adapt to state derived in core

Adapt to this issue

created branch 3-adapt-to-state-derived-in-core to address this issue

mentioned in merge request !3 (merged)

mentioned in commit 53ba9e6d

closed with merge request !3 (merged)