Fixed "dissapearing" of commas