Fix previous commit, see #2224