Change setter to use None instead of False