Resolve states trouble
Fix initial options