- Fix stop problem on Windows
- Move state to another place