SSF-5 Fix security flaw