Collection fixes #8