Fix recursvity