Just a thought. Should we make this a property setter instead?