better label handling