Try to fix FCs

Change-Id: I796e24db34eac3bded860adf4ba471f97cbe4ba1