Fix a race-condition in prefix-assignment