FTF Fir Tree Fixing

FTF Fir Tree Fixing