Fix for exclude logic (again)