Fixed exclusion handling;