Create consistent return point

Change-Id: Iaca35d1d9e94c027b580ead8bec102d1f6306105