fix for GIA-3070