fixed 2 problem issue