Rebased assistants (fix for #233)