Fixed HEAVY BUG blocking base App and feature demo app