high cpu usage bug fixed