fixed App and App states