Talpia fix

Change-Id: Ia6d190656eaa9383e99c4dfc0efbb89fc27d6708