Fix deviation from previous behavior