modified to deal with no subject