Bug exclude if empty