Fix: Security does not need special case