Fixing dynamic collection creation