Use the accessor instead of using property directly
Fix merge conflicts