Fix #15 - Override common translation with the state