Updates didset usage

Fixes #2805

/cc @aerych  (Thanks in advance!)
Thank you!