Fixed inconsistent usage of getters