Fix partial commit #ec93c74 /  (#SDT-22, #SDT-24) Fixed