Minimal fix to prevent FC