Defensive fix