Merge pull request #3 from 30x/XAPID-825

lock down race conditions