First load fix applied