FR 1.4: Security Fix