two bug fixex