commit13 - fixed the setters and getters