Try to fix settings FC

Change-Id: I5160630032888b30aaba9d820ac3a9e44c5bdc80