Fixed Label updating