fix the security bugs