fixed collection
Merge branch 'master' into refactor-utils
merged in refactor-utils