FIxing security issue