Bug fix in unwinding code.