fixed changes given by Katja Verbeeck