disorder fixes