#11 translation
#11 fix values