Eliminate attribution flashing (fixes #1134)