fixed faster loading