Feature/translation subject fix