Added compatibility for numeric values.