Fix For Potential Exploit