Fixed regression after #1090