fixed working state before refactoring