FW fix