Bug fix and translation