fixed labeling issues