fixed issues with security