Additional fix for CO-620