[5m] Fixed 'NaN' errors