Roger: see comment on last commit.