fixed ordering defect