fixed 2 xidv bugs reported by Bob