Fixing timepoint calculation on first submission