Fix All to return value instead of the key value pair