CADMIUM-176 Fixed bugs