fixed translator

Fixes #1028, #988, #983, #1023

That makes the tests pass again.