Fix KB FC once and for all

Change-Id: I360358930e5eb598a8c20d4cae57033a218ac8d6