Numeric issue fix