hopefully last first execution fix...