problems with collation
Merge pull request #668 from inc0/collate

problems with collation