Fix rivets formatter for numbers to not return NaN