fix: Prevent conflict between parallel makers #3519

[lockiechen]

• [x] I have read the contribution documentation for this project.
• [x] I agree to follow the code of conduct that this project follows, as appropriate.
• [x] The changes are appropriately documented (if applicable).
• [x] The changes have sufficient test coverage (if applicable).
• [x] The testsuite passes successfully on my local machine (if applicable).

Summarize your changes: