Fix resolution of original tree command as fallback