Let me check this one -- I did add include locking for a reason but the internals have changed a bit since then.