Fix possible vulnerablity