Save start bugFix