One more lock fix...