Fixed handling of nested calls.