Fix another problem caused by the hack for #1474