Added hack to flip to use PublicReturnAddress