fixed ordering issue