Might fix #367
typo which broke private annotations
Merge remote-tracking branch 'origin/367-fix-race-condition' into develop