fix for first run