Fix unwind

Change-Id: I421d3bba354f81d680a13053c8ec332dda01d78d