Another attempt to deal with decimal-comma