Fixed niggling little race condition, finally\!