Fixing Translation Support