added security related bugs