Fix application bootstrapping to work multiple times