Got rid of infinite recursion