More robust if subject not supplied on android