KT-4159: Fixed