two bug fixe