Minor fix for handle handling.