I think this fixes everything for new subject information
fixed for undefined use cases, I think