Re-added minor fix for labels