Fix processing bugs related to previous commit