Fixed for new connected app