[BUGFIX] Fix spec race condition