Bug fix: properly handle numeric values.