#17657 refactoring first state