fixes #233 - template race condition.
Merge pull request #272 from stephenplusplus/races

fixes #233 - template race condition.