Fixed defect with sizing issues