Fixed issue with empty subjects