fix the preformace issue #1