Handling case where we cannot find args to wrap better