Fixing rewrite
Enabling save of joined object