Possible fix to infinite recoursion problem