correcting label handling