Fix crash when modifying subject