Fixed for EMBPD00144101 and EMBPD00144103