Fix. performance issues