fix issue on startup...