Fixed the accessors