fix for KT-5420