fixed collate issues