much improved stability in the return value to be correct