Fix again mutually recursive functions