- fix for 4.4.2 + performance