More weird behavior after last round of updates.