Work in Cornelia Fiedler's suggestions (Thanks!)