Fixed initial load bug