Try to fix infinite recursion (doesn't work)