Re-use FIP should be working now