Fixed list_calculations