Correct relevant fix from issue #374

Reviewing @bzg issue, there is only one issue to fix as the other where already corrected during translation