Talpia fix

Change-Id: Id5bfdfb080c47eb903ef63bc96c23697f4676904