Fix for slow loading of data