Trying to get rid of potential security issues