Fix for KT-4991

  #KT-4991 Fixed