fixed slow loading