Try to fix Settings

Change-Id: I99cceb0b0b6a588c5db4b0e15bdf609ff42f1a0f