Alexey's fixed slow loading issue