Fix interactive settings

Change-Id: Id7c3f2454dde01a8abbbe947fca96ad1302f776c