Added bugs (10) and (11).