Getter logic improvement