Fixing JAGGERY-351 (Labeling fixed)