Fixed #A defect