Fixed bug where we had infinite recursion.