simplify empty handling