Fixed to handle values.