Fixed First Load Problem