fix subject on rebase