added security
some fix