Fixed a recursivity bug