Add replacement type to hasSubject check

Fixes #173.