Make #2171 compile