Fix potential security hole