fixes #6171 Need improbe the decimal validation