fix some subject weirdness