Fixed label problems