Fix for collection to list