Fix recursive problems