fix for initial load