solved issue with slow performance