fix to include more than metadata