Minor fix zss 576