Second follow-up on bug-report (and Stephen's suggestions)