Small code/security fix