Fix for KT-4989

  #KT-4989 Fixed
Clean