A possible fix regarding performance issues