should fix the high cpu usage issue
merge