fixed excludes issue