Fixes EP-329, refers EP-342