fix label issues