Fix "app" from calling done multiple times