Typhoon fix