Average aggregates discard 0 values

Hi, 

I´m having issue with the aggregated value of average.

the average value is calculated with all the underlying rows taken into account. I want it to discard 0 values.

underlying table:

my matrix:

I want this to show (2+6+5,5)/3 = 4,5   not 4,2 as this is currently calculating (0+3+4+6+8)/5 = 4,2

I want also this to discard the 0 value when I filter these valuse and display total average of 3:

any clever DAX suggestions? :)

Note: I´m not using any measures in this example and I select this option to aggregate: