Allow custom flair - fix bug