fix 100% CPU usage in DS and VS