Made translation lookup more tollarant, however not sure about the correctness