Fixed app-discovery