Supplemental fix for EUCA-9421