Solve preloading issues