Fix recursive issue