fixed a race condition with comments, tested and should be good.