AE: fix2 - don't miss the lock