Accidently broke compatibility with collectionview and tableview