Take into account Matthias's comments