Bug #8 Fixed.