Unmodifiable collection bug

Use add... methods instead of get().add