Fix security issue