Fix Getter Bug