Fixed the performance fb issues