* Fixing ModularLabel issues