Fixed issue as noted by @ay13 | Security Improvements