Fix return value key name bug