fix COLLATE issues