Properly handle not yet published state fields