How to fix collision / race condition - Drizzle Team