Fix nil subject