Fixed manta

Change-Id: I9dea6444bb0918bc7ddb3cf68a943f1228c427bc