Fix for initial load problem