Fixed race conditions in DrawingSvc