Dc/Melanie |#3100| Fixing ut