Getters fix