first attempt fix subject problem.