fixed dumbug 1