Bugfix with exclude-lists