Small bug fix on security