BUGFIX - Collection modification bug