Fix subject rewriting for the default subject.

Issue:	#97
Submitted by:	@eneq123