Fixed bugs introduced from merging translations, where code was duplicated