fix litle performance, again