Fix support for numeric types