Deal with empty arrays better