Fixed the setters