Fix extracting collections