Fixed label and key bug