Fix states for better inheritance #5934