bug fixed 2