corrects some bug display because of merge