Next try at removing this extra setter