try to fix performance