Fixed PIEAE EA-36318