Fix for change subject handling