improved first run handling