excepted collection refactored bug fixed