Fix duplicate app issue