Code fix for EB-7515 and EB-7557