Fix for FIPs