[hishamk]

Thanks for this. You are indeed correct. I've pushed a fix and also added a race test to confirm the fix.