Workaround for KT-3344