Fixed initial page load problem