Fix issue introduced in #2619