Applied Martin Kihlgren's IdentityGenerosity patch,