bugfix: high cpu usage