corrects bug after last merge