Fix issue with initial load.