Fix for KT-3687

 #KT-3687 Fixed