Fixing flair not to break client.