EA-54718 Fixed