Loki makes fix

Change-Id: I5810d27dcf27f5b4b56f0cf3982d5ab8de2297df