fixing root cause of SI-6863

review by @JamesIry