todo: fix performance bug
performance bug fixed