fix for bad races
adding a fixme for later
Merge branch 'feature/issue#94' into develop