fix type, reorder