FIX: Do not randomly replace ; to ,