Settings needs to be fixed first

Change-Id: I135063b617e7b14a225f336f6ac71da8e9542f9d