Bug fix: fixed a scenario that changing the application state resulted in an error