fixed #7 for Nathalie