Addendum to #29: let the user choose