critical bugfix for flair