bug fixed 3