fixup extend self