Fixing FF6