Resolved high cpu usage issue