Fix NaN handling
Fix NaN handling

mihaimaruseac/statistics,Shimuuar/statistics,fpco/statistics,Shimuuar/statistics,bos/statistics,mihaimaruseac/statistics,fpco/statistics,mihaimaruseac/statistics,bos/statistics