Work in more suggestions from Cornelia Fiedler