Fixed to compare with real old code