bug fixed 4