Fix dependency resolution in the overstate

Fix #3111