Bug fix with translation