FIX Handling of recursive methods