Fixed the getters