Fix current app detection