Florian, you may as well make the change you suggested in #402