Additional fix for CO-766