Fixed issue with missed subjects