Fix for EMBPD00117592, work around for EMBPD00108941