Prevent collection modification.
Merge pull request #802 from atom0s/general-devel

Prevent collection modification.