fixes to _set