Fix issue with flairs not being saved.