HUB-55 : Fix class