fixing first load bug