Worked around KT-5694