Fix FC's

Change-Id: I96f7a23c7cf542d7d80e81947e9b3f500f046378