fixed initial state loading