Fixed for EB-2825 -Setter Getter