Fix for table and collection view controller.