#559 | Jaideep | Labels consistency fix